[pull] main from glitch-soc:main#523
Open
pull[bot] wants to merge 1953 commits intoCompostInTraining:mainfrom
Open
[pull] main from glitch-soc:main#523pull[bot] wants to merge 1953 commits intoCompostInTraining:mainfrom
pull[bot] wants to merge 1953 commits intoCompostInTraining:mainfrom
Conversation
Merge upstream changes up to 8a0261c
…oc/merge-upstream Conflicts: - `db/schema.rb`: Upstream re-generated the file, which reordered all the definitions. Re-generated the files as well.
…oc/merge-upstream
Port 3fbb742 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port a700799 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…lines Port 2d5addd to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge upstream changes up to a700799
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…oc/merge-upstream
Port 748dbf3 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port dd27c7b to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port dae0926 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge upstream changes up to d52d0e4
…oc/merge-upstream
Port 380b898 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
… and not a special collection (mastodon#38282)
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…iption is expanded (mastodon#38293)
Merge upstream changes up to db074fc
…oc/merge-upstream
…hen description is expanded Port 43d6695 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 2af5c85 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port cffa8de to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Merge upstream changes up to cffa8de
…oc/merge-upstream
Port 1ee457f to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 605b5b9 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge upstream changes up to 1ee457f
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
11 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )